From 90eda2b17c6208840abfe4e76789bddb5f49d131 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sat, 4 Apr 2020 20:04:42 -0400 Subject: [PATCH] Drop some no longer used code --- gtk/gtkprivate.c | 48 ------------------------------------------------ gtk/gtkprivate.h | 10 ---------- 2 files changed, 58 deletions(-) diff --git a/gtk/gtkprivate.c b/gtk/gtkprivate.c index 9a6cd584dc..5d00978de6 100644 --- a/gtk/gtkprivate.c +++ b/gtk/gtkprivate.c @@ -205,54 +205,6 @@ _gtk_get_primary_accel_mod (void) return primary; } -gboolean -_gtk_translate_keyboard_accel_state (GdkKeymap *keymap, - guint hardware_keycode, - GdkModifierType state, - GdkModifierType accel_mask, - gint group, - guint *keyval, - gint *effective_group, - gint *level, - GdkModifierType *consumed_modifiers) -{ - GdkModifierType shift_group_mask; - gboolean group_mask_disabled = FALSE; - gboolean retval; - - /* if the group-toggling modifier is part of the accel mod mask, and - * it is active, disable it for matching - */ - shift_group_mask = gdk_keymap_get_modifier_mask (keymap, - GDK_MODIFIER_INTENT_SHIFT_GROUP); - if (accel_mask & state & shift_group_mask) - { - state &= ~shift_group_mask; - group = 0; - group_mask_disabled = TRUE; - } - - retval = gdk_keymap_translate_keyboard_state (keymap, - hardware_keycode, state, group, - keyval, - effective_group, level, - consumed_modifiers); - - /* add back the group mask, we want to match against the modifier, - * but not against the keyval from its group - */ - if (group_mask_disabled) - { - if (effective_group) - *effective_group = 1; - - if (consumed_modifiers) - *consumed_modifiers &= ~shift_group_mask; - } - - return retval; -} - static gpointer register_resources (gpointer data) { diff --git a/gtk/gtkprivate.h b/gtk/gtkprivate.h index f4ba489ba6..de94c03a9b 100644 --- a/gtk/gtkprivate.h +++ b/gtk/gtkprivate.h @@ -86,16 +86,6 @@ GdkModifierType _gtk_replace_virtual_modifiers (GdkKeymap *keymap, GdkModifierType modifiers); GdkModifierType _gtk_get_primary_accel_mod (void); -gboolean _gtk_translate_keyboard_accel_state (GdkKeymap *keymap, - guint hardware_keycode, - GdkModifierType state, - GdkModifierType accel_mask, - gint group, - guint *keyval, - gint *effective_group, - gint *level, - GdkModifierType *consumed_modifiers); - gboolean gtk_propagate_event_internal (GtkWidget *widget, GdkEvent *event, GtkWidget *topmost); -- 2.30.2